Auto merge of #3904 - tee-too:fix-3880, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 8 Apr 2017 21:29:11 +0000 (21:29 +0000)
committerbors <bors@rust-lang.org>
Sat, 8 Apr 2017 21:29:11 +0000 (21:29 +0000)
Sort tests so that unit tests are run before integration tests

Fix #3880


Trivial merge